From: Jonas Ådahl <jadahl@gmail.com>
Date: Thu, 2 Feb 2023 14:50:43 +0000 (+0100)
Subject: layout: Explicitly destroy hot corners on shutdown
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~405^2^2~75
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=def50c38dafdeee5c20b7c59ebe39189cb2dcf6f;p=gnome-shell.git

layout: Explicitly destroy hot corners on shutdown

This won't be handled by our existing actor destruction path as the
ripple actors are added directly to the stage and not the uiGroup.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2623>
---

diff --git a/js/ui/layout.js b/js/ui/layout.js
index 090295f0f..ed09c8f83 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -236,6 +236,7 @@ var LayoutManager = GObject.registerClass({
                 global.stage.add_actor(adoptedActor);
             }
 
+            this._destroyHotCorners();
             this.uiGroup.destroy();
         });
 
@@ -415,13 +416,14 @@ var LayoutManager = GObject.registerClass({
         }
     }
 
+    _destroyHotCorners() {
+        this.hotCorners.forEach(corner => corner?.destroy());
+        this.hotCorners = [];
+    }
+
     _updateHotCorners() {
         // destroy old hot corners
-        this.hotCorners.forEach(corner => {
-            if (corner)
-                corner.destroy();
-        });
-        this.hotCorners = [];
+        this._destroyHotCorners();
 
         if (!this._interfaceSettings.get_boolean('enable-hot-corners')) {
             this.emit('hot-corners-changed');